From: iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Date: Sun, 3 Oct 2004 14:35:11 +0000 (+0000)
Subject: bitkeeper revision 1.1159.1.201 (41600e1fkVMoQU0dVgk1h6vT502hEg)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~550
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e2f19d90960ae2173b56471c1f435818ef7ced6c;p=xen.git

bitkeeper revision 1.1159.1.201 (41600e1fkVMoQU0dVgk1h6vT502hEg)

Merge
---

e2f19d90960ae2173b56471c1f435818ef7ced6c
diff --cc tools/libxc/xc_linux_restore.c
index d42293aff0,0988055af3..3973c85225
--- a/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@@ -243,6 -245,18 +243,15 @@@ int xc_linux_restore(int xc_handle, XcI
      }
      shared_info_frame = op.u.getdomaininfo.shared_info_frame;
  
+     if(ioctxt->flags & XCFLAGS_CONFIGURE)
+     {
+         if(xcio_configure_domain(ioctxt))
+         {
+            xcio_error(ioctxt, "Configuring domain failed"); 
+            goto out;
+         }
+     }
+ 
 -    if ( (pm_handle = init_pfn_mapper((domid_t)dom)) == NULL )
 -        goto out;
 -
      /* Build the pfn-to-mfn table. We choose MFN ordering returned by Xen. */
      if ( get_pfn_list(xc_handle, dom, pfn_to_mfn_table, nr_pfns) != nr_pfns )
      {